Merge branch 'master' into cleanup

diff --cc alan.cc
Simple merge

diff --cc an1.cc
Simple merge

diff --cc arcdist.cc
Simple merge

diff --cc bcr.cc
Simple merge

diff --cc bend.cc
Simple merge

diff --cc brauniger_iq.cc
Simple merge

diff --cc cst.cc
Simple merge

diff --cc dg-100.cc
Simple merge

diff --cc discard.cc
Simple merge

diff --cc duplicate.cc
Simple merge

diff --cc easygps.cc
Simple merge

diff --cc exif.cc
Simple merge

diff --cc filter_vecs.cc
Simple merge

diff --cc g7towin.cc
Simple merge

diff --cc garmin.cc
Simple merge

diff --cc garmin_fit.cc
Simple merge

diff --cc garmin_gpi.cc
Simple merge

diff --cc garmin_xt.cc
Simple merge

diff --cc gdb.cc
Simple merge

diff --cc geo.cc
Simple merge

diff --cc geojson.cc
Simple merge

diff --cc ggv_log.cc
Simple merge

diff --cc ggv_ovl.cc
Simple merge

diff --cc globalsat_sport.cc
Simple merge

diff --cc glogbook.cc
Simple merge

diff --cc gopal.cc
index 0de7468beda96c89b84981a75aef3a7d9666e180,ff5f9b2b3d25d1a696b78cbc6c54fddb561e717e..603d1750bcf7448b86c32f562e70b740a4f6fb16
--- 1/gopal.cc
--- 2/gopal.cc
+++ b/gopal.cc
@@@ -51,12 -51,14 +51,15 @@@
  #include "defs.h"
  #include "cet_util.h"
  #include "csv_util.h"
 -#include "strptime.h"
 -#include "jeeps/gpsmath.h"
  #include "grtcirc.h"
 -#include <stdlib.h>
 -#include <stdio.h>
 +#include "jeeps/gpsmath.h"
 +#include "strptime.h"
  #include <cmath>
 +#include <cstdio>
 +#include <cstdlib>
+ #include <QtCore/QDateTime>
+ #include <QtCore/QString>
++
  #define MYNAME "gopal"
  
  static gbfile* fin, *fout;

diff --cc gpssim.cc
Simple merge

diff --cc gpsutil.cc
Simple merge

diff --cc gpx.cc
Simple merge

diff --cc gtrnctr.cc
Simple merge

diff --cc height.cc
Simple merge

diff --cc hiketech.cc
Simple merge

diff --cc holux.cc
Simple merge

diff --cc html.cc
Simple merge

diff --cc humminbird.cc
Simple merge

diff --cc igc.cc
Simple merge

diff --cc ignrando.cc
Simple merge

diff --cc igo8.cc
Simple merge

diff --cc interpolate.cc
Simple merge

diff --cc itracku.cc
Simple merge

diff --cc jtr.cc
Simple merge

diff --cc kml.cc
Simple merge

diff --cc lmx.cc
Simple merge

diff --cc lowranceusr.cc
Simple merge

diff --cc lowranceusr4.cc
Simple merge

diff --cc maggeo.cc
Simple merge

diff --cc main.cc
index f57fb0ea2760a3ea53886b4097c64b20b533960b,409185f2bfb957ae24cc02d78579c3053877108a..e61e6fa7de156611af9c1d129f90e9125c4eaf7e
--- 1/main.cc
--- 2/main.cc
+++ b/main.cc
@@@ -17,23 -17,29 +17,32 @@@
  
   */
  
 +#include <QtCore/QCoreApplication>
 +#include <QtCore/QTextCodec>
 +#include <QtCore/QVector>
+ #include <QtCore/QStack>
+ #include <QtCore/QString>
+ #include <QtCore/QTextCodec>
+ #include <QtCore/QTextStream>
+ #include <QtCore/QCoreApplication>
  
 -#include "defs.h"
 -#include "filterdefs.h"
  #include "cet.h"
  #include "cet_util.h"
  #include "csv_util.h"
 +#include "defs.h"
 +#include "filterdefs.h"
  #include "inifile.h"
  #include "session.h"
+ #include "src/core/file.h"
  #include "src/core/usasciicodec.h"
 -#include <ctype.h>
 -#include <locale.h>
 -#include <stdlib.h>
 -#include <stdio.h>
 +#include <cctype>
 +#include <clocale>
 +#include <cstdio>
 +#include <cstdlib>
  #include <signal.h>
+ #ifdef AFL_INPUT_FUZZING
+ #include "argv-fuzz-inl.h"
+ #endif
  
  #define MYNAME "main"
  

diff --cc mapasia.cc
Simple merge

diff --cc mapfactor.cc
Simple merge

diff --cc mapsend.cc
Simple merge

diff --cc mmo.cc
Simple merge

diff --cc mtk_locus.cc
Simple merge

diff --cc mtk_logger.cc
Simple merge

diff --cc navicache.cc
Simple merge

diff --cc naviguide.cc
Simple merge

diff --cc netstumbler.cc
Simple merge

diff --cc nmea.cc
Simple merge

diff --cc nmn4.cc
Simple merge

diff --cc ozi.cc
Simple merge

diff --cc pcx.cc
Simple merge

diff --cc pocketfms_wp.cc
Simple merge

diff --cc polygon.cc
Simple merge

diff --cc position.cc
Simple merge

diff --cc psitrex.cc
Simple merge

diff --cc radius.cc
Simple merge

diff --cc random.cc
Simple merge

diff --cc raymarine.cc
Simple merge

diff --cc saroute.cc
Simple merge

diff --cc shape.cc
index e24e5b069b5adf318ba5e9b8e639320015973dd8,28c94ca5a5399623f000ba29809c88b00fffd9ec..32282b96e0d6327407908b440dc200ffdbd028d5
--- 1/shape.cc
--- 2/shape.cc
+++ b/shape.cc
@@@ -19,9 -19,13 +19,14 @@@
      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
  
   */
+ #include <QtCore/QLatin1String>
+ #include <QtCore/QString>
+ #include <QtCore/QStringList>
+ #include <QtCore/QVector>
+ 
  #include "defs.h"
  #include "shapelib/shapefil.h"
 +#include <cstdlib>
  
  #if SHAPELIB_ENABLED
  static SHPHandle ihandle;

diff --cc skyforce.cc
Simple merge

diff --cc skytraq.cc
Simple merge

diff --cc smplrout.cc
Simple merge

diff --cc sort.cc
Simple merge

diff --cc stackfilter.cc
Simple merge

diff --cc subrip.cc
Simple merge

diff --cc text.cc
Simple merge

diff --cc tiger.cc
Simple merge

diff --cc tmpro.cc
Simple merge

diff --cc tomtom.cc
Simple merge

diff --cc tpo.cc
Simple merge

diff --cc trackfilter.cc
Simple merge

diff --cc transform.cc
Simple merge

diff --cc v900.cc
Simple merge

diff --cc validate.cc
Simple merge

diff --cc vcf.cc
Simple merge

diff --cc vidaone.cc
Simple merge

diff --cc vitosmt.cc
Simple merge

diff --cc vpl.cc
Simple merge

diff --cc waypt.cc
Simple merge

diff --cc wbt-200.cc
Simple merge

diff --cc wfff_xml.cc
Simple merge

diff --cc xcsv.cc
Simple merge

diff --cc xol.cc
Simple merge